From: Jasper St. Pierre <jstpierre@mecheye.net>
Date: Wed, 11 Feb 2015 08:58:42 +0000 (-0800)
Subject: screenshot: Use MetaCursorTracker to fetch the cursor position
X-Git-Tag: archive/raspbian/50.5-1+rpi1~1^2~1013^2^2~1868
X-Git-Url: https://dgit.raspbian.org/%22http://www.example.com/cgi/%22/%22http:/www.example.com/cgi/%22?a=commitdiff_plain;h=d54b87c4559bd9d74fa10d3e3d1e38a933bea051;p=gnome-shell.git

screenshot: Use MetaCursorTracker to fetch the cursor position

ClutterInputDevice will use the last place it knows the cursor to be,
which isn't always up to date when running under X11.
---

diff --git a/src/shell-screenshot.c b/src/shell-screenshot.c
index 1ab146bad..076ea3f07 100644
--- a/src/shell-screenshot.c
+++ b/src/shell-screenshot.c
@@ -249,22 +249,6 @@ do_grab_screenshot (ShellScreenshot *screenshot,
   cogl_object_unref (bitmap);
 }
 
-static void
-get_pointer_coords (int *x,
-                    int *y)
-{
-  ClutterDeviceManager *manager;
-  ClutterInputDevice *device;
-  ClutterPoint point;
-
-  manager = clutter_device_manager_get_default ();
-  device = clutter_device_manager_get_device (manager, META_VIRTUAL_CORE_POINTER_ID);
-
-  clutter_input_device_get_coords (device, NULL, &point);
-  *x = point.x;
-  *y = point.y;
-}
-
 static void
 _draw_cursor_image (MetaCursorTracker     *tracker,
                     cairo_surface_t       *surface,
@@ -281,7 +265,7 @@ _draw_cursor_image (MetaCursorTracker     *tracker,
   int xhot, yhot;
 
   screenshot_region = cairo_region_create_rectangle (&area);
-  get_pointer_coords (&x, &y);
+  meta_cursor_tracker_get_pointer (tracker, &x, &y, NULL);
 
   if (!cairo_region_contains_point (screenshot_region, x, y))
     {